From: Takashi Iwai <tiwai@suse.de>
Date: Sat, 9 Jul 2011 09:58:06 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~12499^2~124^2~16
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9975c2e4c3e4fc26148723dc99b5f0667716a249;p=linux-4.9.git

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c
---

9975c2e4c3e4fc26148723dc99b5f0667716a249